create cfa checker for unique #221
Conversation
jesyspa
force-pushed
the
formal-verification
branch
from
09ff50c
to
74cb389
Compare
Eric-Song-Nop
force-pushed
the
cfa-unique-checker
branch
from
358a1d5
to
5874959
Compare
Eric-Song-Nop
force-pushed
the
cfa-unique-checker
branch
from
5874959
to
e4fc535
Compare
|
Forced updated this pr with current formver branch, for now a basic structure of CFA visitor with stack for intermediate expression unique information is established. |
Eric-Song-Nop
force-pushed
the
cfa-unique-checker
branch
from
ef9a105
to
e4fc535
Compare
plugins/formal-verification/formver.uniqueness/src/org/jetbrains/kotlin/formver/UniqueCFA.kt
Outdated
Show resolved
Hide resolved
|
|
||
| interface UniqueCheckerContext { | ||
| val config: PluginConfiguration | ||
| val errorCollector: ErrorCollector | ||
| val session: FirSession | ||
| val uniqueId: ClassId | ||
| val uniqueStack: ArrayDeque<ArrayDeque<PathUnique>> |
There was a problem hiding this comment.
This is a confusing type to work with. Could you make a dedicated class for this, please? Preferably both the stack and its elements, I suspect.
Why is it a Deque if you want to use it as a stack?
| sealed class PathUnique | ||
| data class Path(val symbol: FirVariableSymbol<FirVariable>) : PathUnique() | ||
| data class Level(val level: Set<UniqueLevel>) : PathUnique() |
There was a problem hiding this comment.
Please add some comments for these types. What do they denote?
plugins/formal-verification/formver.uniqueness/src/org/jetbrains/kotlin/formver/UniqueCFA.kt
Outdated
Show resolved
Hide resolved
| if (node is EnterNodeMarker) { | ||
| context.uniqueStack.add(ArrayDeque()) | ||
| } else if (node is ExitNodeMarker) { | ||
| context.uniqueStack.popLast().lastOrNull()?.let { context.uniqueStack.last().add(it) } | ||
| } | ||
| return data |
There was a problem hiding this comment.
This function seems to always be called explicitly; it's not that these nodes are handled automatically by it. Two helper function onEnter and onExit would probably work better.
| } catch (e: Exception) { | ||
| errorCollector.addErrorInfo("... while checking uniqueness level for ${declaration.source.text}") |
There was a problem hiding this comment.
We use this kind of info when producing internal errors. I would actually not use ErrorCollector here at all; you already have the reporter.
| data: PathAwareControlFlowInfo<FirVariableSymbol<FirVariable>, Set<UniqueLevel>>, | ||
| ): PathAwareControlFlowInfo<FirVariableSymbol<FirVariable>, Set<UniqueLevel>> { | ||
| // TODO: this is where function call parameter checking should happen | ||
| // Here do not call visitNode |
plugins/formal-verification/formver.uniqueness/src/org/jetbrains/kotlin/formver/UniqueCFA.kt
Outdated
Show resolved
Hide resolved
plugins/formal-verification/formver.uniqueness/src/org/jetbrains/kotlin/formver/UniqueCFA.kt
Outdated
Show resolved
Hide resolved
| val passedUnique: Set<UniqueLevel> = when (varUnique) { | ||
| is Path -> data[NormalPath]?.get(varUnique.symbol) ?: setOf(UniqueLevel.Shared) | ||
| is Level -> varUnique.level | ||
| } |
There was a problem hiding this comment.
At this point, shouldn't we be taking some kind of meet or join?
There was a problem hiding this comment.
Yes, this is where meet should happen, let me implement a very simplified version of it
For now, it just adds an extra CFA checker to the code, while need to remove the original one and add some basic functionality with some testing